Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop BTreeMap casts from reborrowing #74777

Merged
merged 1 commit into from
Aug 14, 2020
Merged

Conversation

ssomers
Copy link
Contributor

@ssomers ssomers commented Jul 26, 2020

Down in btree/node.rs, the interface and use of cast_unchecked look a bit shady. It's really just there for inverting forget_type which does not borrow. By borrowing we can't write the same cast_unchecked in the same way at the Handle level.

No change in undefined behaviour or performance.

@rust-highfive
Copy link
Collaborator

r? @sfackler

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 26, 2020
@bors
Copy link
Contributor

bors commented Jul 28, 2020

☔ The latest upstream changes (presumably #73265) made this pull request unmergeable. Please resolve the merge conflicts.

@ssomers ssomers marked this pull request as draft August 1, 2020 13:10
@ssomers ssomers changed the title Stop BTreeMap casts from reborrowing, weed out superfluous ones Stop BTreeMap casts from reborrowing Aug 2, 2020
@ssomers
Copy link
Contributor Author

ssomers commented Aug 2, 2020

Continuing from #75058.
r? @Mark-Simulacrum

@ssomers ssomers marked this pull request as ready for review August 2, 2020 19:49
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 13, 2020

📌 Commit 0522040 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 13, 2020
@bors
Copy link
Contributor

bors commented Aug 14, 2020

⌛ Testing commit 0522040 with merge 7996182...

@bors
Copy link
Contributor

bors commented Aug 14, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 7996182 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 14, 2020
@bors bors merged commit 7996182 into rust-lang:master Aug 14, 2020
@ssomers ssomers deleted the btree_cleanup_7 branch August 14, 2020 14:09
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants